From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sun, 23 Dec 2012 03:21:47 +0000 (-0500)
Subject: messageTray: Remove code for ignoring num lock / scroll lock
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5066
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=42c1285ead5fa6c57c82c87bb50dbeac3ce18400;p=gnome-shell.git

messageTray: Remove code for ignoring num lock / scroll lock

Clutter now ignores these masks, so we can remove code that depends
on this.

https://bugzilla.gnome.org/show_bug.cgi?id=691731
---

diff --git a/configure.ac b/configure.ac
index 65ae03bb6..c8600f052 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ fi
 
 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 
-CLUTTER_MIN_VERSION=1.11.11
+CLUTTER_MIN_VERSION=1.13.4
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.35.4
 MUTTER_MIN_VERSION=3.7.4
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 517e7a979..246bbf653 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1630,10 +1630,7 @@ const MessageTray = new Lang.Class({
     },
 
     _onNotificationKeyRelease: function(actor, event) {
-        let ignoredModifiers = global.display.get_ignored_modifier_mask();
-        let modifierState = event.get_state() & ~ignoredModifiers;
-
-        if (event.get_key_symbol() == Clutter.KEY_Escape && modifierState == 0) {
+        if (event.get_key_symbol() == Clutter.KEY_Escape && event.get_state() == 0) {
             this._closeNotification();
             return true;
         }